Fixed git issues.
Build issues fixed.