more changes to make the build work on osx/docker/wercker