XML Code fixes