Fixes for Python3: removed tuples in parameters