Fix review comments from Felix.