And a few more error dialog tweaks.