More tweaks to not override unfinished change times.