Port the fixes that slipped through the cracks for 11.14.4