Merge corrections to fix on-load event