More date change tweaks