More build changes.