Fixes to cat.