Diag fixes