Fixed Python3.3 compat and more