Merge "Fix wrong guard values for 64 bit."