Minor fixes for Python3 compability