Minor adjustments for merge