dzil build fixes and diag improvements