More build file changes.