Fix relationships