Fixes to Builder