Fix some bugs collection