Fixes for MusicBrainz and nettle

Pinging @clinty