py2exe and py3 fixes