Adding build failure fixes