Further ctrl-1/2 tweaks