Strings reference fix and xml cleanup