Fixes for the last commit about kill focus. #1873