Fixes for python 3 support