Some Lint fixes