More command line fixes