max_date more fixes.