Minor updates after review