Fix XML return types