Fixed problems with the command switches