More fixes for x86