Fixed some py3 compatibility issues
Updated changes