Fix compilation, adapted to newest libs