Applied patch to fix build issues