Fixes during cherry picking.