Fixed things related to 1.1 category system