Added additional diagnostics for logging