Merging fixes.