5.3 compatibility fixes.