Adding changes for project to compile nicely in OSX