ZX2C4 specific patches.