[PATCH] 32-bit fixes