Get the build working with Peter Vlugter's help.