Modify kill list and fix #3