Fixed things to use fewer volumes.