another minor fix in several places