Small v1.2 cleanups.

I've finally checked out the latest changes and redid some small clean-ups against the v1.2 branch.