Fixes.
32 and 64bit binaries