Add additional OS X hacks