Wx string exorcism fixups

some little changes I missed and fixing the mistakes done by automatic merging