Fix date coercion