Assorted cosmetic fixes