- Fix some issues with now() default