Fix x86 Fruitjector regressions