minor enhancements to build system