Changes per Nigel's code review