Fix various style and linter problems