Fix some small issues that linter suggested.