Minor fixes for screenshotting