Command shortcuts tweaks