Quick fixes made on site.

(They're in core too, and will be in the next update from there)