Minor improvements to Map Barrels workflow