Fix command line integration.