minor fixes to delay on load and merge conflicts