Minor update. Rest on hold for next release.