Minor changes due to nitpicks