tweaks on some handlers