Minor updates after code review