Attempting to fix date issues