more cat fixes