Fix wrap versions in 1.16

Use either stable branches or tags, or specific commits if there aren't any tags. This way the build won't break because of updates in these repos.