[PATCH v2 0/2] A couple nbdkit-related fixes