builder fixes