build enhancements