Fix help output etc.