Attempt to fix date issues