Fixes for the switch command

:blush: