Fixed a few things to make pylint happy