Attempt to fix remaining linting errors -- may not work as I'm unable to run the build locally on my own machine to verify.