Volume bugfixes (again! yarr)