Fix build against more recent libraries