Fix Some Errors