Commit with fixes to run on OSX