Basic modifications to date_util and form_util