Updates for Python2 backward compatibility