Various updates from code review