Additional fixes for new SCML format