Support i386 machines.
Fix rename bugs.