#1 dom builder fixes