Some fixes for volume setting