MISC upgrades
Merge pull request #859 from stefanpenner/misc-upgrades

MISC upgrades