Workarounds for pre-24.4 incompatibilities