Minor updates for sakai 10