diff --git a/src/hb-face.cc b/src/hb-face.cc
index b8d7e84d7c716a05e06db2f97629bcd1ce334272..2fef09d03d30c8b6809a3d0a14b9b04d676089f0 100644
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
@@ -514,7 +514,7 @@ hb_face_get_table_tags (hb_face_t    *face,
 			unsigned int *table_count, /* IN/OUT */
 			hb_tag_t     *table_tags /* OUT */)
 {
-  if (face->destroy != _hb_face_for_data_closure_destroy)
+  if (face->destroy != (hb_destroy_func_t) _hb_face_for_data_closure_destroy)
   {
     if (table_count)
       *table_count = 0;
diff --git a/src/hb-private.hh b/src/hb-private.hh
index 4edb27cb714ca744ff15e9c5eaab08531745b592..ac00e022b3275d3a2be3cf27653fea61c81c7de9 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -147,7 +147,7 @@ extern "C" void  hb_free_impl(void *ptr);
 #define HB_FUNC __func__
 #endif
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5140)
 /* https://github.com/harfbuzz/harfbuzz/issues/630 */
 #define __restrict
 #endif