fix 32bit issues