Caught a few more Python 2-isms