Build system repairs