Fixed cli options