Some linting fixes while I wait for BigJob to run in the background...