Solved some problems with XML elements.