Fixed build problems with XML helper