Minor changes from Nick code review