Final fixes to make mergeable.