None of these are worthy of a specific commit, or even have a real reason behind them, but I didn't want to lose them.
(cherry picked from commit 086a81b7a5bbe1fc022efb5935ff68f6ad71ddaf)