Minor OCD fixes