More small changes

Last fix of the day, probably.