Fix few minor issues