Some linting fixes