More py3k support