Minor tweaks for CtrlSpace