MNinor bug fixes after the category changes