minor fixes to discrim analysis