More external updates to work around Git's deficiencies