Forward compatibility patches.