categories getting locked - code review fixes