Volume binding and small fixes.