Minor updates following code review