fixes for cbp files