more relationship fixes