Adjust packages. Add check for i386.