Add workarounds for yet additional arkref bugs