Adjustments to fix build issues