fixes related to relationship changes