fixes for cli