Fix the OSX problem properly. Also switch branch.