Corrections from code review #3540