Fixing some git issues