diff --git a/include/Map/Entrance.hpp b/include/Map/Entrance.hpp
index 318b5d2c..d9bea6ef 100644
--- a/include/Map/Entrance.hpp
+++ b/include/Map/Entrance.hpp
@@ -10,7 +10,7 @@
 class Entrance : public SysObject {
     /* 00 */ Vec3p mPos;
     /* 0c */ unk16 mAngle;
-    /* 0e */ unk8 mUnk_0e;
+    /* 0e */ s8 mUnk_0e;
     /* 0f */ unk8 mUnk_0f;
     /* 10 */ s32 mUnk_10;
     /* 14 */
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp
index 9a9a2c37..0608b6aa 100644
--- a/include/Map/MapBase.hpp
+++ b/include/Map/MapBase.hpp
@@ -45,11 +45,8 @@ public:
     /* 013 */ unk8 mUnk_013;
     /* 014 */ unk8 mUnk_014;
     /* 015 */ unk8 mUnk_015;
-    /* 016 */ unk8 mUnk_016;
-    /* 017 */ unk8 mUnk_017;
-    /* 017 */ unk8 mUnk_017;
-    /* 018 */ unk8 mUnk_018;
-    /* 019 */ unk8 mUnk_019;
+    /* 016 */ unk8 mUnk_016[2];
+    /* 018 */ unk8 mUnk_018[2];
     /* 01a */ unk8 mUnk_01a;
     /* 01b */ unk8 mUnk_01b;
     /* 01c */ unk8 mUnk_01c;