Merge "Fix compilation issue for 64bit"