Added autodetection and override of 32/64-bit mode