Make duetto specific code more similar to the original
A couple of fixes to string on duetto