Fix data references