merge fixes after removal of canonical structures