Fixes before merging to unstable-jumbo.