Skip to content
Fix some issues spotted by GK in the 17.0.8 build.