merge patchs
ufoai fix build