Fixes for relationship checks