Fix #4 and fix Screensaver build