Minor changes for cross region baking