Tweaks to work with flashlight