Some additional bug fixes for the focuslock