[CHORE] Minor changes