Minor bugfixes and upgrade changes.  Now on the the real changes.