Fixes for OSX =_=