Build/test failures in v4.1.50