minor fixes to commit 10934 from bug#6257