Few patchs to merge our codebase