Check in a few changes made a while ago.