Added fixes for python > 3.0