fixes after merge, all python 2 tests passing