Some more Lint and formatting fixes