All done, cleanup fixes begin