Fix / addition to debug messages