Assorted clean-ups in preparation of release

This request adds two small clean-ups, including fixing one test case that was failing for quite some time.