Tweak dates and calcs