diff --git a/include.xml b/include.xml
index f1dc110e7..0f18dcbae 100644
--- a/include.xml
+++ b/include.xml
@@ -41,7 +41,7 @@
 		
 		<ndll name="std" haxelib="hxcpp" if="cpp" />
 		<ndll name="regexp" haxelib="hxcpp" if="cpp" />
-		<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="emscripten || ios" />
+		<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="emscripten || ios || static_link" />
 		
 		<ndll name="lime" if="included" />
 		
diff --git a/project/Build.xml b/project/Build.xml
index 9991f66b9..805a92a13 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -176,7 +176,7 @@
 			
 			<compilerflag value="-DSTATIC_LINK" if="emscripten" />
 			
-			<file name="${HXCPP}/project/libs/zlib/ZLib.cpp" if="emscripten || ios" />
+			<file name="${HXCPP}/project/libs/zlib/ZLib.cpp" if="emscripten || ios || static_link" />
 			
 		</section>
 		
diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp
index 913dd9f87..99f7e719a 100644
--- a/project/src/ExternalInterface.cpp
+++ b/project/src/ExternalInterface.cpp
@@ -488,7 +488,7 @@ namespace lime {
 	value lime_image_data_util_fill_rect (value image, value rect, value color) {
 		
 		Image _image = Image (image);
-		Rectangle _rect = Rectangle (rect); 
+		Rectangle _rect = Rectangle (rect);
 		ImageDataUtil::FillRect (&_image, &_rect, val_number (color));
 		return alloc_null ();
 		
diff --git a/templates/cpp/static/BuildMain.xml b/templates/cpp/static/BuildMain.xml
index 6771bd076..cbb4c534a 100644
--- a/templates/cpp/static/BuildMain.xml
+++ b/templates/cpp/static/BuildMain.xml
@@ -78,7 +78,7 @@
 			
 		</section>
 		
-		<lib name="ApplicationMain${DBG}${LIBEXT}" />
+		<lib name="libApplicationMain${DBG}${LIBEXT}" />
 		
 	</target>
 	
diff --git a/templates/cpp/static/Main.cpp b/templates/cpp/static/Main.cpp
index 5a92451a7..dc71655b3 100644
--- a/templates/cpp/static/Main.cpp
+++ b/templates/cpp/static/Main.cpp
@@ -7,6 +7,9 @@
 extern "C" const char *hxRunLibrary ();
 extern "C" void hxcpp_set_top_of_stack ();
 
+extern "C" int zlib_register_prims ();
+extern "C" int lime_cairo_register_prims ();
+extern "C" int lime_openal_register_prims ();
 ::foreach ndlls::::if (registerStatics)::
 extern "C" int ::nameSafe::_register_prims ();::end::::end::
 
@@ -19,6 +22,9 @@ extern "C" int main(int argc, char *argv[]) {
 	
 	hxcpp_set_top_of_stack ();
 	
+	zlib_register_prims ();
+	lime_cairo_register_prims ();
+	lime_openal_register_prims ();
 	::foreach ndlls::::if (registerStatics)::
 	::nameSafe::_register_prims ();::end::::end::