Misc changes Dave's review part 2