diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp
index 3a0a2561..37c7789d 100644
--- a/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -754,7 +754,7 @@ void CIrrDeviceSDL::maximizeWindow()
 }
 
 //! Get the position of this window on screen
-core::position2di getWindowPosition()
+core::position2di CIrrDeviceSDL::getWindowPosition()
 {
     return core::position2di(-1, -1);
 }
diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp
index d74c9298..1664c88d 100644
--- a/source/Irrlicht/CIrrDeviceStub.cpp
+++ b/source/Irrlicht/CIrrDeviceStub.cpp
@@ -55,16 +55,18 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
 CIrrDeviceStub::~CIrrDeviceStub()
 {
 	VideoModeList->drop();
-	FileSystem->drop();
 
 	if (GUIEnvironment)
 		GUIEnvironment->drop();
 
+	if (SceneManager)
+		SceneManager->drop();
+	
 	if (VideoDriver)
 		VideoDriver->drop();
 
-	if (SceneManager)
-		SceneManager->drop();
+	if ( FileSystem )
+		FileSystem->drop();
 
 	if (InputReceivingSceneManager)
 		InputReceivingSceneManager->drop();