Fixes for Vox Stuff.