Fix instance rules for functional dependencies