Some fix for cli input and output