Fixed backref issues