Add new diagnostics (see Yannis email)