couple of bug fixes related to muc renaming