Remove weak references to get building for older OSX