fix minor mac_os_x issues