Merge "Fix minor bugs about value type."