Fix a few of the inevitable errors in the last checkin.