added missing diagnostics