minor changes to supress warning dialogs