Upgrade Kill List and fixes #3