Minor changes after review