Count more calls, even if they are currently only present in the interface and not yet used
Bugfix: some integers are too large to be an integer