Fixed S m and device kill