Merge "Fix 64bit compilation issues with IndirectRef."