Fixed few coverity issues reported