Build fixes & enhancements