Fixed bugs created while building out cats