Fix some oddities when A/B'ing or previewing...