fixes for python 2 compatibility