build: fix mistakes in previous build system updates