Changes required after WeakHandle moved to Public API in Core