Minor bug fix

Minor bug fixes after added .SWITCHSCRIPT command