Fixed screensaver issues