Fixed some issues with killing