Fix up date feature definitions and feature steps