Sort some bugs