diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index fdb8e8f..3466bb9 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -773,7 +773,7 @@
   /* Extract standard_width from writing system/script specific */
   /* metrics class.                                             */
 
-  FT_LOCAL_DEF( void )
+  FT_CALLBACK_DEF( void )
   af_cjk_get_standard_widths( AF_StyleMetrics  metrics_,  /* AF_CJKMetrics */
                               FT_Pos*          stdHW,
                               FT_Pos*          stdVW )
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index e98861c..6f672d5 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -1506,7 +1506,7 @@
   /* Extract standard_width from writing system/script specific */
   /* metrics class.                                             */
 
-  FT_LOCAL_DEF( void )
+  FT_CALLBACK_DEF( void )
   af_latin_get_standard_widths( AF_StyleMetrics  metrics_, /* AF_LatinMetrics */
                                 FT_Pos*          stdHW,
                                 FT_Pos*          stdVW )
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 89a0263..c850dfc 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -1200,8 +1200,8 @@
         FT_Byte*     charstring_base;
         FT_ULong     charstring_len;
 
-        FT_Fixed*      stack;
-        FT_Byte*       q;
+        FT_Fixed*  stack;
+        FT_Byte*   q = NULL;
 
 
         charstring_base = ++p;
@@ -1243,7 +1243,7 @@
         /* converting it back to charstring number representations     */
         /* (this is ugly, I know).                                     */
         /* The maximum required size is 5 bytes per stack element.     */
-        if ( FT_QALLOC( q, 2 * sizeof ( FT_ListNode ) +
+        if ( FT_QALLOC( q, (FT_Long)( 2 * sizeof ( FT_ListNode ) ) +
                            5 * ( decoder.top - decoder.stack ) ) )
           goto Exit;