Fix Some minor issues