misc changes in the internal builder