Fix more CLI issues caused by wrong types