Various fixes -- you don't expect me to remember them all, do you?