Fixing more of the small issues