Fixing data refs