Command line fixes