Fix review comments on content