Fix some major bag with del component