Trying in vain to fix build issues