Fix for new builder features