More updates to git remote
Fixing build problems