diff --git a/src/event.c b/src/event.c
index 096a635..baeef34 100644
--- a/src/event.c
+++ b/src/event.c
@@ -48,7 +48,7 @@ static int luavgl_obj_on_event(lua_State *L)
   }
 
   lv_event_code_t code = lua_tointeger(L, 2);
-  if (code >= _LV_EVENT_LAST) {
+  if (code >= LV_EVENT_LAST) {
     luaL_argerror(L, 2, "event code illegal");
     return 0;
   }
@@ -68,7 +68,7 @@ static int luavgl_obj_on_event(lua_State *L)
         event->dsc = NULL;
         event->L = NULL;
         event->ref = LUA_NOREF;
-        event->code = _LV_EVENT_LAST;
+        event->code = LV_EVENT_LAST;
         if (res != LV_RESULT_OK) {
           return luaL_error(L, "Failed to remove event dsc: %d\n", res);
         }
@@ -88,7 +88,7 @@ static int luavgl_obj_on_event(lua_State *L)
       break;
     }
 
-    if (events[i]->code == _LV_EVENT_LAST) {
+    if (events[i]->code == LV_EVENT_LAST) {
       /* code marked as _LV_EVENT_LAST means this event has been removed, we can
        * reuse it. */
       event = events[i];
diff --git a/src/fs.c b/src/fs.c
index 5ca3427..d145bcc 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -2,6 +2,8 @@
 #include "private.h"
 #include "rotable.h"
 
+#include "src/lvgl_private.h"
+
 typedef struct luavgl_fs_s {
   lv_fs_file_t file;
   bool closed; /* userdata exists but lv_fs has been closed */
diff --git a/src/style.c b/src/style.c
index 1362c45..0b7eca8 100644
--- a/src/style.c
+++ b/src/style.c
@@ -18,7 +18,7 @@ typedef enum {
 } style_type_t;
 
 enum {
-  LV_STYLE_SIZE = _LV_STYLE_LAST_BUILT_IN_PROP + 1,
+  LV_STYLE_SIZE = LV_STYLE_LAST_BUILT_IN_PROP + 1,
   LV_STYLE_PAD_ALL,
   LV_STYLE_PAD_VER,
   LV_STYLE_PAD_HOR,
@@ -269,7 +269,7 @@ static int luavgl_set_flex_layout_kv(lua_State *L, style_set_cb_t cb,
 
     /* if reverse presents */
     if (luavgl_strstr(str, "-reverse")) {
-      flow |= _LV_FLEX_REVERSE;
+      flow |= LV_FLEX_REVERSE;
     }
   }
   lua_pop(L, 1);
@@ -282,9 +282,9 @@ static int luavgl_set_flex_layout_kv(lua_State *L, style_set_cb_t cb,
   if (lua_type(L, -1) == LUA_TSTRING) {
     str = lua_tostring(L, -1);
     if (lv_strcmp("wrap", str) == 0) {
-      flow |= _LV_FLEX_WRAP;
+      flow |= LV_FLEX_WRAP;
     } else if (lv_strcmp("wrap-reverse", str) == 0) {
-      flow |= _LV_FLEX_WRAP | _LV_FLEX_REVERSE;
+      flow |= LV_FLEX_WRAP | LV_FLEX_REVERSE;
     }
     /* else: normal */
   }
@@ -479,7 +479,7 @@ static int luavgl_set_style_kv(lua_State *L, style_set_cb_t cb, void *args)
     default:
       break;
     }
-  } else if ((prop & mask) <= _LV_STYLE_LAST_BUILT_IN_PROP) {
+  } else if ((prop & mask) <= LV_STYLE_LAST_BUILT_IN_PROP) {
     cb(prop & mask, value, args);
   } else {
     return luaL_error(L, "unknown style");
diff --git a/src/util.c b/src/util.c
index feb4aac..ec7cf12 100644
--- a/src/util.c
+++ b/src/util.c
@@ -151,7 +151,7 @@ LUALIB_API int luavgl_obj_createmetatable(lua_State *L,
                                           const rotable_Reg *l, int n)
 {
   if (luavgl_obj_getmetatable(L, clz) != LUA_TNIL) /* meta already exists */
-    return 0; /* leave previous value on top, but return 0 */
+    return 1;
   lua_pop(L, 1);
 
   /* create metatable, 4 elements, normally for __magic, __index, __gc and
@@ -179,7 +179,7 @@ LUALIB_API int luavgl_obj_createmetatable(lua_State *L,
   rotable_newlib(L, l); /* t = {l} */
   if (clz != &lv_obj_class) {
     /* b = getmatatable(clz.base_clz) */
-    if (luavgl_obj_getmetatable(L, clz->base_class) == LUA_TNIL) {
+    if (luavgl_obj_getmetatable(L, lv_obj_get_base_class(clz)) == LUA_TNIL) {
       return luaL_error(L, "need to init base class firstly: %s.", name);
     }