Fixes and adjustments from The latestest Version Upgrade on github