ScreenShot fixes