some tweaks on shortcuts