Build fixes. Tests still don't build.