Address comments in prior patches