Small fixes from Yuta + Lumi Unc fix