Add appropriate dependencies
Try to be more careful about not throwing away symlinks