Updates wrt. new devel.