CMS-3665 Fixed some errors.