While going through the tree, fix some more packages which had similiar issues with too strict conflicts, bump the revisions of those.