Try to fix builds