Added i386 for build targets
more arch tweaks