Hirsute fixes

A couple of simple bug fixes for hirsute:

• https://launchpad.net/bugs/1919404
• https://launchpad.net/bugs/1911036

Cherry-picked from future upstream release 3.24.28 so we can drop the patches after that.