Correct bugs introduced in run_amwg_diags