BZ-10553 fixed minor issues.