Address andy@ 2.6 release candidate feedback