Update to fix build issues