Fix some build weirdness.