Fixes for the gateway to work with the new builder