Fix Some Bugs