Some missing changes.
Some OCD fixes.