Fix review comments from Drew.