Cosmetic fixes to the interface