Some fix post-merging (2)