Smaller command line bug fixes