Merge "Remaining code review fixes"