Some updates from code review