Fix some 32 bit issues.