Changes wrt. recent devel changes.