Tweaks for stuff broken on Stretch
This tag has no release notes.