Cosmetic fixes: