Minor builder fixes