Update the spec
Fix build, and builds on mac too