Support 32 and 64-bit for exe-only, and fix -k