Fix dependency issues causing build failure