Various lint fixes.
Merge pull request #418 from XhmikosR/lint-fixes

Various lint fixes.