plus a few python3 fixes for problem that appeared now that we have more test coverage See merge request !1128
