Forward-compatibility patches.