Fixes more Python 3 errors