correct lib naming, add support for i386