Some fixes to make diaspy more Python 2.x-friendly