This fixes various strtoll/strtol issues, including tests