Small OCD fixes