[Minor] Some changes