Fixing more bugs in Volt