bug 1112: Fix things popped up in review: