Correct Some Issues