More fixes to work with ejabberd 14