Fixes for linter