Update builder. Fixes 2 failing tests.

Total 4 currently failing.