Fixes for Builder