minor/cosmetic fixes