Fixed empty volume error, minor other fixes.