cat fixes [ci-skip]