Handle dates more gracefully