More OCD fixes