More Rank9 Builder bug fixes