More vold fixes