Reference fixes
merged