More build changes