Another try at fixing weird build issues.