fix Some bugs

fix Some bugs