Fixed xml stuff