Attempt to fix builds