Fix remaining stop_date/end_date issues