Fix references keys