Apothecary fixes for 32 bit linux that reports i686.