Get the revised build system to work