Categorical fixups

Some fixups for Categoricals.

Fixes: #3678
why don't u say both of these are index-like (very confusing before and now)