Doug's review fixes.