Urgent fix for null dates in COGS