Further fixes throughout.