Bugfixes for exit confirmation