Fix review comments from Chris