Fix new style generation of build