Four tiny improvements