fixes for mac