Fix infix builder bugs