Fix typo and bump to 7 and 21 days for end dates