Build failures with latest GIT