Build and test failures with git master