Misc fixes Python3