fix compilation after xml structure reorganization