Fixing py3 compat... 

With this fixes we have no errors in a py3 env with current master...