Build environment updates

This pull contains commits to fix the OS X build and allow GitMake test to pass.