py3 compatibilty

Marian Babikrequested to merge
py3_compat into master

Found some minor changes to fix py3 compatibilty. They need to be tested before merging.

Merge request reports