Merging throttling fixes