Reducing Git.git complexity
Fixing build