Minor changes, mostly.