5525: Fixed some bugs

Fixed some bugs