Tweak the build to be more like mirage ...