more cosmetic fixes