fixes for the new command