Adjust date calculation

Accounts for registration and CFP closing at the end of day.