Fixed a few problems with screensaving