Fix issues reported by SVACE tool in CKM module.