Fixes for the switch command

totally, but been lazy :frog: