Updating to new build framework, fixing dependencies