Various cosmetic fixes