cmap fixes for format 13