More code analysis.
Fixed code analysis errors.