Fix (partly) references