Fixes for newer gnunet code.