some minor fixes for CAT