Fix flake8 errors from newer version of flake8

Since a new version of flake8 came out, we've found a few build failures. This addresses those failures