General fixes towards a dual-mode pi/rho console.