More fixes to ejabberd 14.05.