Fixes for 11058, 11041, 10088