Several code review changes