End sprint 18 corrections