Common updates from code review