Fixes from mjs-volume master