Minor changes for merge