Further diagnostics improvements and fixed an invalid JSON field access.