Chase more build system changes