diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index b26c4bd32..14ec92828 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -73,8 +73,8 @@ static struct hb_shaper_list_lazy_loader_t : hb_lazy_loader_t<const char *,
   }
   static void destroy (const char **l)
   { hb_free (l); }
-  static const char ** get_null ()
-  { return (const char **) nil_shaper_list; }
+  static const char * const * get_null ()
+  { return nil_shaper_list; }
 } static_shaper_list;
 
 static inline
diff --git a/src/hb-shaper.cc b/src/hb-shaper.cc
index 9a2a2e6ef..da4253ed6 100644
--- a/src/hb-shaper.cc
+++ b/src/hb-shaper.cc
@@ -40,7 +40,7 @@ static_assert (0 != ARRAY_LENGTH_CONST (_hb_all_shapers), "No shaper enabled.");
 
 static inline void free_static_shapers ();
 
-static struct hb_shapers_lazy_loader_t : hb_lazy_loader_t<const hb_shaper_entry_t,
+static struct hb_shapers_lazy_loader_t : hb_lazy_loader_t<hb_shaper_entry_t,
 							  hb_shapers_lazy_loader_t>
 {
   static hb_shaper_entry_t *create ()
@@ -85,7 +85,7 @@ static struct hb_shapers_lazy_loader_t : hb_lazy_loader_t<const hb_shaper_entry_
 
     return shapers;
   }
-  static void destroy (const hb_shaper_entry_t *p) { hb_free ((void *) p); }
+  static void destroy (hb_shaper_entry_t *p) { hb_free (p); }
   static const hb_shaper_entry_t *get_null ()      { return _hb_all_shapers; }
 } static_shapers;