Some fix post-merging (3)