Add 32bit support