Fix CLI: Small fixes