Round 4 fixes (empty category).