Some cleanup

A few small things.