Fix recent comments from reviewer