Bug/category fixes