Fixed defaults for options in commands