Post 4.10 fixes.