Exit fixes not tested