more build system refinement