fixing few minor issues