Fixed few coverity reported issues:Aug22 2014