diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 0215e43df..cfae8e872 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1042,6 +1042,7 @@ namespace MWInput
 
             if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get(),settingStr))
                 (*mScreenCaptureOperation) (*(screenshot.get()),0);
+                // mScreenCaptureHandler->getCaptureOperation() causes crash for some reason
         }
     }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5fbc5d397..b2d97e81d 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -654,7 +654,7 @@ namespace MWRender
             {    
                 dest->allocateImage(mSize * 6,mSize,mImages[0]->r(),mImages[0]->getPixelFormat(),mImages[0]->getDataType());
 
-                for (int i = 0; i < 6; i++)
+                for (int i = 0; i < 6; ++i)
                     osg::copyImage(mImages[i].get(),0,0,0,mImages[i]->s(),mImages[i]->t(),mImages[i]->r(),dest,i * mSize,0,0);
 
                 return;
@@ -778,7 +778,9 @@ namespace MWRender
         int screenshotW = mViewer->getCamera()->getViewport()->width();
         int screenshotH = mViewer->getCamera()->getViewport()->height();
         SphericalScreenshot::SphericalScreenshotMapping screenshotMapping = SphericalScreenshot::MAPPING_SPHERICAL;
-        int cubeSize = screenshotW / 2;    
+        int cubeSize = screenshotMapping == SphericalScreenshot::SphericalScreenshotMapping::MAPPING_SMALL_PLANET ?
+            screenshotW:         // planet mapping needs higher resolution
+            screenshotW / 2;    
 
         std::vector<std::string> settingArgs;
         boost::algorithm::split(settingArgs,settingStr,boost::is_any_of(" "));