Merge "Fix 64bit issues in logging code."