Fixit and cleanup