Classified some bugs