Linting fixes and less logspam