Fixes for python 3 compatibility