Broken build dependencies fixed