Fixes for failed py3 tests