Exit fixes ...