Linter fixes.
Merge pull request #258 from klausw-g/lint-fixes

Linter fixes.