Improved calculation item number and disable some logging.