Adapt to the devel branch