post-merge mac fixes