Some reference model fixes