Added add-ons to fix dialog errors