Some fixes for python 3.3