More debug logging is added.