diff --git a/gfx/graphite2/src/Code.cpp b/gfx/graphite2/src/Code.cpp
index 01f9d511e95..893fa65d301 100644
--- a/gfx/graphite2/src/Code.cpp
+++ b/gfx/graphite2/src/Code.cpp
@@ -169,16 +169,17 @@ Machine::Code::Code(bool is_constraint, const byte * bytecode_begin, const byte
         bytecode_end,
         pre_context,
         rule_length,
-        silf.numClasses(),
-        face.glyphs().numAttrs(),
-        face.numFeatures(), 
+        static_cast<uint16>(silf.numClasses()),
+        static_cast<uint16>(face.glyphs().numAttrs()),
+        static_cast<byte>(face.numFeatures()),
         {1,1,1,1,1,1,1,1, 
          1,1,1,1,1,1,1,255,
          1,1,1,1,1,1,1,1, 
          1,1,1,1,1,1,0,0, 
          0,0,0,0,0,0,0,0, 
          0,0,0,0,0,0,0,0, 
-         0,0,0,0,0,0,0, silf.numUser()}
+         0,0,0,0,0,0,0,
+         static_cast<byte>(silf.numUser())}
     };
     
     decoder dec(lims, *this);
diff --git a/gfx/graphite2/src/FileFace.cpp b/gfx/graphite2/src/FileFace.cpp
index 1e37763fb6a..8187b92e331 100644
--- a/gfx/graphite2/src/FileFace.cpp
+++ b/gfx/graphite2/src/FileFace.cpp
@@ -35,10 +35,10 @@ of the License or (at your option) any later version.
 //#include "inc/NameTable.h"
 
 
-using namespace graphite2;
-
 #ifndef GRAPHITE2_NFILEFACE
 
+using namespace graphite2;
+
 FileFace::FileFace(const char *filename)
 : _file(fopen(filename, "rb")),
   _file_len(0),