diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 0ed9ff6e7..411ccf62d 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -616,7 +616,7 @@ shipspeed (const ship * sh, const unit * u)
 	if (sh->damage) k = (k * (sh->size * DAMAGE_SCALE - sh->damage) + sh->size * DAMAGE_SCALE- 1) / (sh->size*DAMAGE_SCALE);
 #endif
 
-	return min (k, MAXSPEED);
+	return k;
 }
 
 /* erwartete Anzahl Einheiten x 2 */
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 0e44b8927..8ce5ad93c 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -748,8 +748,6 @@ enum {
 
 /* ------------------------------------------------------------- */
 
-#define MAXSPEED   21
-
 extern int shipspeed(const struct ship * sh, const struct unit * u);
 extern int init_data(const char * filename);
 
diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj
index cb607499e..42dfd34d3 100644
--- a/src/eressea/eressea-lua.vcproj
+++ b/src/eressea/eressea-lua.vcproj
@@ -162,7 +162,8 @@
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+				DisableSpecificWarnings="4505"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/src/eressea/lua/region.cpp b/src/eressea/lua/region.cpp
index 48a4142c8..59d25a291 100644
--- a/src/eressea/lua/region.cpp
+++ b/src/eressea/lua/region.cpp
@@ -220,7 +220,7 @@ region_move(region& r, int x, int y)
     }
     rn = findregion(x+delta_x[dir], y+delta_y[dir]);
     if (rn!=NULL) {
-      direction_t reldir = (dir + 3) % MAXDIRECTIONS;
+      direction_t reldir = (direction_t)((dir + 3) % MAXDIRECTIONS);
       rn->connect[reldir] = &r;
     }
     r.connect[dir] = rn;
diff --git a/src/eressea/lua/unit.cpp b/src/eressea/lua/unit.cpp
index ec19a7de5..bd6116d14 100644
--- a/src/eressea/lua/unit.cpp
+++ b/src/eressea/lua/unit.cpp
@@ -534,6 +534,7 @@ bind_unit(lua_State * L)
     // key-attributes for named flags:
     .def("set_flag", &set_flag)
     .def("get_flag", &get_flag)
+    .def_readwrite("flags", &unit::flags)
 
     // items:
     .def("get_item", &unit_getitem)