Replace some more dialogs