Fixes for new relationship usage