Bug Fixes for XEP-0092