Bug fixes for CIDC files