Trying to fix a couple of date issues