Fix command line issues.