Changes due to libhaloc compatibility