Merge "Fix 64-bit issues and compiler warnings."