Bug fixes wrt categories