Fixes in relationships