Fix command line interface