Minor updates on the way to review