Fix issues in OSX bundle