Fix various things (including broken command line)