BROKEN Bugfixes to handling of tares and diffs