Some fixes

* Fixed stun baton icon sometimes not updating when it is out of charge
*