Changes from code review session