Modified some minor issues