Fix build with new libs