Build config fixes