Issue #2: more 2.x portability