fix a bunch of Builder processing bugs