Cat fixes