Corrected end date mgmt