Fixes for updated-timestamp determination logic