Builder fixes