More build failure fixes