move clang fixup to onDeferredInit