Bug fix
Bug fixes and perf improvements

Improvements to legacy HVMobile xml parsing code.