Various other fixes and git error fixes
Various other fixes and git error fixes