Category bug fixes