More LongLong fixes
Fix #9761
Fix typo in options