more xml fixes/adds

Change-Id: I9e9b78609beca5ecef14e38e553170d422963c93