More build fixing