build failure fixes