minor handler changes