Minor updates before review