arc fixes for mac

code review