post upgrade fixes
git fixes error messages