Fixes for flashlight