Fix build, and builds on mac too