Fix commandline interface