Fix review problems