Further fixes to volumes