Fix performance failures on x86_64