Python 3.{1,2} fixes