More fixes to cat