Fixed some more 32/64 bit issues