Add better diags