Fixes for 12257:9b337a87d6ec.