Exit call fixes