Compatibility fixes for python 3