FIX: categorical fixups