More fixes for auto-merge