more fixes on mac config