Updates from code review on Tuesday