more vold handling fixes + various const correctness