fixes to the builder functionality