xml structure minor fixes