Tweaks to allow 2-zone to 3-zone expansion to complete.