Fixed up y86 implementation