Changes made to support 3to2 build - most tests pass