Support Mavericks and other updates

A grab-bag of minor fixups and polish, cherry-pick to taste.

:tulip: :turtle: