Fix reviewed issues