Updates after code review (except timeout)