Changes for mac transition.