Merge pull request #2484 from JosJuice/volume-return-types Volume: Use more appropriate types for some returned values
