Fix sky + cleanups