Attempting to fix compilation issues with --enable-experimental