OK, even after hours of testing at home, nothing like a production environment to show the bugs.
There's a timeout issue with renaming that I've fixed.
The other one is some odd behaviour with account consolidation. I'm disabling consolidation for the moment until I can look into it. It's 3:30AM, so I'm not going to attempt it now
Bed time for me...
Rob