Minor fixes throughout.