Fix issues for auto-merge