Change manager param names back to preserve backward-compat
Fix unicode case for 3.2