Some improvements for structure_killed