Fixing some nulls and date format