fix some bugs report by users