Some nonfunctional changes