Fixes for x86.