Issue #2 Lingering fixes to make build work on OSX