Build enhancements + lint fixes