JC-2032: Fixed remarks