5.10 compatibility fixes.