Several more cosmetic fixes