Exit confirmation now mostly works