Fixes for FREEPBX-7293