Build enhancements to support more compilers