Adapt to libhaloc changes