Cope with more build changes