A few fixes to make messages less  annoying.