Make sure things work properly under Python 2.x