Make it all work after small libsd api changes.