More changes to compensate KUL XML change