os/x fixes