14.10 fixes