Fixed some linter found errors.