more edition builder fixes