Fixing a few things for i386.