Fixed more static analysis errors.