fix some dependencies in the new build system. Fix a bug we triggered in fabricate.