Merge rmarchev's vox fixes (bug #1812)