Tinker more with the build