Fix problems for merging