more os x fixes