Mostly minor changes