FREEPBX-7540 fixes