32bit fixes, I think