In place fixes for mac