Category: fix relationship problems