some 32bit fixes