#3294: fix some inaccuracies