Minor updates for post-update-run-once