more python 3 compatibility fixes (#544)