Some fix post-merging