Fixes category bugs