UCJEPS-461: tiny tweaks to make updatedat work.