Fixes to the git