Fixes in handling of current / next camp volume.