Clean volume paths

Fixes #8659