Cut down on some more build errors