Add better support for ix86