More LongLong fixes
Fix #9761