fixes for null xmd_labels