Fix review nits