Minor changes after Jim feedback