Fix Some Bugs

Fix SOme Bugs