Fix review issues