Adds fixes for volume formatting