Fixing SF's sunshine problems