--- a/gfx/graphite2/src/Code.cpp
+++ b/gfx/graphite2/src/Code.cpp
@@ -164,26 +164,27 @@ Machine::Code::Code(bool is_constraint, 
         failure(alloc_failed);
         return;
     }
     
     const decoder::limits lims = {
         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);
     if(!dec.load(bytecode_begin, bytecode_end))
        return;
     
     // Is this an empty program?
     if (_instr_count == 0)

--- a/gfx/graphite2/src/FileFace.cpp
+++ b/gfx/graphite2/src/FileFace.cpp
@@ -30,19 +30,19 @@ of the License or (at your option) any l
 //#include "inc/Endian.h"
 #include "inc/FileFace.h"
 //#include "inc/GlyphFace.h"
 //#include "inc/SegCacheStore.h"
 //#include "inc/Segment.h"
 //#include "inc/NameTable.h"
 
 
-using namespace graphite2;
+#ifndef GRAPHITE2_NFILEFACE
 
-#ifndef GRAPHITE2_NFILEFACE
+using namespace graphite2;
 
 FileFace::FileFace(const char *filename)
 : _file(fopen(filename, "rb")),
   _file_len(0),
   _header_tbl(NULL),
   _table_dir(NULL)
 {
     if (!_file) return;