Couple of fixes
https://github.com/discourse/discourse/pull/39610
https://github.com/discourse/discourse/pull/39611
cc @nat