Fix some nested xml marshaling