fixed issues reported by CR