Maintenance fixes.

Please accept my maintenance fixes -- tested on Mac OS X 10.9.