volume related fixes