MFH reason: Unbreak Gnome and Gnome-lite setup A few other minor enhancements MFH: 2020Q3 (runtime fix)