Some patchs with fixes