bug 321: fixing minor issues