Fix onDomReady not triggered issue
Fix args unwrapped issue