Minor cosmetic fixes