More changes for Unix command line operation.