Make build more consistent with the other projects.