Fix more relationship stuff