Fixed remaining OSX integration issues