Clean volume paths
Fixes #8659

Signed-off-by: Brian Goff <cpuguy83@gmail.com>