Resolved some issue from static analysis tool