Merge "Fix warnings from static analysis tool"