Resolving conflicts / preparing for Mac build.