[polyml] Fixes to 5.3