Fix some others bugs