Fixed few minor issues