Some first review fixes.