(bug 2288) Fix minor issues