Fix the merged build. Probably not strictly correct but allows us to "make test".