Filip Gawin Fixes for CVbFile