diff --git a/src/eepp/core/memorymanager.cpp b/src/eepp/core/memorymanager.cpp
index 1dd0a656a..7e2087246 100644
--- a/src/eepp/core/memorymanager.cpp
+++ b/src/eepp/core/memorymanager.cpp
@@ -66,7 +66,7 @@ void* MemoryManager::reallocPointer( void* data, const AllocatedPointer& aAlloca
 
 	AllocatedPointerMapIt it = sMapPointers.find( data );
 
-	if ( it->second.mTrack )
+	if ( it != sMapPointers.end() && it->second.mTrack )
 		eePRINTL( "Realloc pointer %p at '%s' %d", data, aAllocatedPointer.mFile.c_str(),
 				  aAllocatedPointer.mLine );
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp b/src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
index cc0c5fdd2..c86a84903 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
@@ -14,7 +14,7 @@ namespace EE { namespace Maps { namespace Private {
 
 class MapEditor;
 
-class EE_API MapLayerProperties {
+class EE_MAPS_API MapLayerProperties {
   public:
 	typedef std::function<void()> RefreshLayerListCb;
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp b/src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
index 9958416a1..4c426797b 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
@@ -14,7 +14,7 @@ namespace EE { namespace Maps { namespace Private {
 
 class MapEditor;
 
-class MapObjectProperties {
+class EE_MAPS_API MapObjectProperties {
   public:
 	MapObjectProperties( GameObjectObject* Obj );
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp b/src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
index 732488de7..f10d14491 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
@@ -12,7 +12,7 @@ using namespace EE::UI;
 
 namespace EE { namespace Maps { namespace Private {
 
-class EE_API TileMapProperties {
+class EE_MAPS_API TileMapProperties {
   public:
 	TileMapProperties( TileMap* Map );
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
index 285494ea8..df2b72fb9 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
@@ -9,7 +9,7 @@ using namespace EE::UI;
 
 namespace EE { namespace Maps { namespace Private {
 
-class EE_API UIGOTypeNew {
+class EE_MAPS_API UIGOTypeNew {
   public:
 	UIGOTypeNew( std::function<void( std::string, Uint32 )> Cb );
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
index 7115cc0dc..ee45493ac 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
@@ -18,7 +18,7 @@ class GameObjectObject;
 
 namespace Private {
 
-class EE_API UIMap : public UIWindow {
+class EE_MAPS_API UIMap : public UIWindow {
   public:
 	static UIMap* New( UITheme* Theme, TileMap* Map = NULL );
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
index 6ecbf1612..67ddadecc 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
@@ -10,7 +10,7 @@ using namespace EE::UI;
 
 namespace EE { namespace Maps { namespace Private {
 
-class EE_API UIMapLayerNew {
+class EE_MAPS_API UIMapLayerNew {
   public:
 	typedef std::function<void( UIMapLayerNew* )> NewLayerCb;
 
diff --git a/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
index d7bc2bf1f..8c79d70fb 100644
--- a/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
+++ b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
@@ -13,7 +13,7 @@ using namespace EE::UI;
 
 namespace EE { namespace Maps { namespace Private {
 
-class EE_API UIMapNew {
+class EE_MAPS_API UIMapNew {
   public:
 	UIMapNew( UIMap* Map, std::function<void()> NewMapCb = cb::Callback0<void>(),
 			  bool ResizeMap = false );