Shouldn't we use the git versions of all these too?