Fixing up some additional build dependencies