#xxx Minor corrections